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

• 069c98983d Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-04-19 22:22:14 +08:00
• 6dbdb0a1d6 modal to approve match and reject match edmondlang 2023-04-19 22:21:53 +08:00
• db4ad2c05f Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-04-19 21:03:22 +08:00
• 44ddcebced modal to approve match and reject match edmondlang 2023-04-19 21:02:52 +08:00
• b54f901e4d Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-04-19 18:59:21 +08:00
• 7cb88cb486 modal to approve match and reject match edmondlang 2023-04-19 18:59:00 +08:00
• 36fa0e1080 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-04-19 13:26:32 +08:00
• 204068d864 fix bug date error in update announcement function in settings page edmondlang 2023-04-19 13:26:06 +08:00
• 83e883abb9 fix duplicated listing section bug Omair Saleh 2023-04-18 17:23:27 +08:00
• 4de455dfbb Merge branch 'dillon/accounting-bank-mapping' into 'development' omair saleh 2023-04-18 09:18:15 +00:00
• b94d50325c fix duplicated listing section bug Omair Saleh 2023-04-18 17:16:11 +08:00
• bf2528d98a update delete booking controller edmondlang 2023-04-18 13:50:26 +08:00
• ddd218cf4e Merge branch 'dillon/accounting-bank-mapping' into 'development' omair saleh 2023-04-18 04:10:20 +00:00
• ceb64a66a1 Merge branch 'development' into 'dillon/accounting-bank-mapping' omair saleh 2023-04-18 04:10:13 +00:00
• 4a6ae598fa fix and update the functionality and the ui for accounting automation Omair Saleh 2023-04-18 12:07:27 +08:00
• 9c1b470ea1 Merge branch 'dillon/improvement-1' into 'master' Dillon Ngo 2023-04-15 13:07:15 +00:00
• 3e78b68ff2 Merge branch 'dillon/improvement-1' into development Dillon 2023-04-15 20:58:56 +08:00
• c1b53973e5 Reduce flooding of logs from Perfex CRM dillon/improvement-1 Dillon 2023-04-15 20:58:21 +08:00
• 4fd9538f5e Promo code input ui added sharifcse57 2023-04-15 01:16:45 +06:00
• c6b14b11c6 Merge branch 'dillon/accounting-bank-mapping' into development Dillon 2023-04-12 05:22:13 +08:00
• aa8d766b54 Minor update Dillon 2023-04-12 05:22:05 +08:00
• a2951a0fdf Merge branch 'dillon/accounting-bank-mapping' into development Dillon 2023-04-12 05:03:13 +08:00
• 6aa2ed53c7 Allow user to upload statement repeatedly + master list page + rerun mapping + bug fixes Dillon 2023-04-12 05:02:48 +08:00
• 42e8594689 Merge branch 'dillon/accounting-bank-mapping' into development Dillon 2023-04-11 04:15:33 +08:00
• 1954cfa63c Mapping of bank statement records with exchange and shipping portal + UI to edit the details Dillon 2023-04-11 04:14:53 +08:00
• 2b174e42c7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-04-10 22:33:34 +08:00
• 5bd221050c remove console.log edmondlang 2023-04-10 22:33:04 +08:00
• 7ca23edb9b 1. ImportBankRecordController (script for mapping that get the data from xsl file, needs to be changed to get data from db, and also to retrive data from shipping portal) 2. BankStatementController (for importing data from csv files from bank to insert into the database) accounting-bank-mapping Omair Saleh 2023-04-03 17:48:39 +08:00
• cfec4c58b2 Merge branch 'dillon/debug-and-fixes-2-29' into 'master' Dillon Ngo 2023-04-01 16:25:23 +00:00
• d844cf64a4 Merge branch 'dillon/debug-and-fixes-2-29' into development Dillon 2023-03-31 17:43:37 +08:00
• a3a1c912a3 Minor code amendment dillon/debug-and-fixes-2-29 Dillon 2023-03-31 17:43:22 +08:00
• f295cbb9f4 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development Dillon 2023-03-31 00:18:04 +08:00
• 214ae61362 Merge branch 'dillon/debug-and-fixes-2-29' into development Dillon 2023-03-31 00:17:48 +08:00
• 1f3e1d32a1 Sync code changes from Shipping Portal + Fix a problem related to activating 1688 service Dillon 2023-03-31 00:17:21 +08:00
• b97170378d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-03-30 16:03:43 +08:00
• 749c6e0bef Merge branch 'change-admin-role-type' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2023-03-30 16:02:56 +08:00
• 2139a4ea0b change admin role type change-admin-role-type edmondlang 2023-03-30 16:02:39 +08:00
• dfe659084d change admin role type DESKTOP-5I7S92L\nicho 2023-03-30 15:52:45 +08:00
• 800e743fd6 Merge branch 'dillon/debug-and-fixes-2-29' into 'master' Dillon Ngo 2023-03-29 14:18:46 +00:00
• eaf7ce4b67 Insert logs for debugging purpose on production Dillon 2023-03-29 22:16:24 +08:00
• 12cf0c541b Merge branch 'dillon/crm-create-task-3-26' into 'master' Dillon Ngo 2023-03-28 15:54:34 +00:00
• 69072c6b38 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development Dillon 2023-03-28 23:29:30 +08:00
• 530061cefd Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-28 23:28:55 +08:00
• 42290b83a4 Trying to fix a problem when user billing address not yet setup dillon/crm-create-task-3-26 Dillon 2023-03-28 23:28:24 +08:00
• 8a9edd6b5b Merge branch '1688-tnc' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-03-28 12:23:13 +08:00
• 245f647e6f update 1688 tnc 1688-tnc edmondlang 2023-03-28 12:22:51 +08:00
• 446f78eb2c Merge branch '1688-tnc' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-03-28 11:16:25 +08:00
• ee28f13cbe 1688 tnc edmondlang 2023-03-28 11:16:03 +08:00
• d867421901 1688 tnc DESKTOP-5I7S92L\nicho 2023-03-27 16:27:47 +08:00
• 1c35cde3e3 Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-25 14:18:29 +08:00
• d24cb38247 Fix another error from production logs Dillon 2023-03-25 14:17:43 +08:00
• 74e5fcd7ca Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-25 08:59:59 +08:00
• 2ef853cc62 Template update Dillon 2023-03-25 08:59:53 +08:00
• dc363ad466 Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-25 02:16:51 +08:00
• 3cac5d20a8 Minor fixes Dillon 2023-03-25 02:16:38 +08:00
• 6512ba8f4d Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-25 02:07:58 +08:00
• b7487394d2 Minor fixes and cleanup Dillon 2023-03-25 02:07:44 +08:00
• a481b4a789 Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-24 15:16:28 +08:00
• 58bdfaaee7 minor code streamline from shipping portal Dillon 2023-03-24 15:16:21 +08:00
• 4cb70bbe5a Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-24 03:17:34 +08:00
• be4111196e CRM Task with dynamic data Dillon 2023-03-24 03:13:18 +08:00
• 74c7084364 Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-23 04:32:02 +08:00
• e1596d69be Fix a problem with new registration uploading document Dillon 2023-03-23 04:30:22 +08:00
• 5cdb7ed95c Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-23 04:20:37 +08:00
• bd319c1ee7 Added new task, new task details such as priority and due date + some cleanup Dillon 2023-03-23 04:20:07 +08:00
• 04ad7286a7 Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-22 23:53:42 +08:00
• 01046dc4f3 Fix a inconsistency in data update for task into CRM Dillon 2023-03-22 23:53:32 +08:00
• fac4beb9d4 Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-22 22:42:54 +08:00
• c0af4f4e3a Fix an error from testing at dev Dillon 2023-03-22 22:42:43 +08:00
• 3e64214100 Merge branch 'dillon/crm-create-task-3-26' into development Dillon 2023-03-22 22:17:21 +08:00
• 3bb62a98c0 PO related tasks added when payment is made + Update PO task status Dillon 2023-03-22 22:16:48 +08:00
• 7448455f5c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-03-22 11:40:08 +08:00
• d24983d1b3 Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2023-03-22 11:36:22 +08:00
• 3411529594 update honey trap .env edmondlang 2023-03-22 11:36:00 +08:00
• b1588aa9c7 Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-03-20 23:18:38 +08:00
• e29109b834 update honey trap with search edmondlang 2023-03-20 23:14:56 +08:00
• ad776d972e fix bug - delete seasonalSegment and add date after current month edmondlang 2023-03-20 22:55:58 +08:00
• 6ad285808f Merge branch 'dillon/debug-and-fixes-1-22' into 'master' Dillon Ngo 2023-03-20 14:15:03 +00:00
• 5ae4f6f562 Merge branch 'dillon/crm-update-multiple-tasks-status' into 'master' Dillon Ngo 2023-03-20 14:14:39 +00:00
• ec90f76c13 Merge branch 'dillon/crm-gen-invoice-update' into 'master' Dillon Ngo 2023-03-20 14:13:40 +00:00
• a84f1fe165 test honey trap cron edmondlang 2023-03-20 11:09:42 +08:00
• 28a0088d26 Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-03-20 11:08:47 +08:00
• 39a98c469a update honey trap cron edmondlang 2023-03-20 11:08:16 +08:00
• 52980b8863 update honey trap cron edmondlang 2023-03-20 10:28:01 +08:00
• 1fb42f15ba Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-03-20 10:13:18 +08:00
• 584819a513 honey trap update edmondlang 2023-03-20 10:12:47 +08:00
• b0a788771b Merge branch 'dillon/debug-and-fixes-1-22' into development Dillon 2023-03-19 22:31:45 +08:00
• d602cde450 Merge branch 'dillon/crm-update-multiple-tasks-status' into dillon/debug-and-fixes-1-22 dillon/debug-and-fixes-1-22 Dillon 2023-03-19 22:24:15 +08:00
• 3fc449b08e Merge branch 'dillon/crm-gen-invoice-update' into dillon/debug-and-fixes-1-22 Dillon 2023-03-19 22:24:07 +08:00
• a8b69cd6a6 Sync code for bug fixes at Shipping Portal Dillon 2023-03-19 22:16:42 +08:00
• 7893616bcb Merge branch 'dillon/crm-gen-invoice-update' into development Dillon 2023-03-19 04:56:11 +08:00
• 4a4c53e388 Fix a problem of a mismatch in data update for invoice dillon/crm-gen-invoice-update Dillon 2023-03-19 04:55:54 +08:00
• 629ed269eb Merge branch 'dillon/crm-gen-invoice-update' into development Dillon 2023-03-19 04:32:26 +08:00
• 5a226d18e1 Undo a change that was meant for shipping portal Dillon 2023-03-19 04:32:01 +08:00
• 4f1dff9367 Merge branch 'dillon/crm-update-multiple-tasks-status' into development Dillon 2023-03-19 03:49:50 +08:00
• 039bb8ce9a Merge branch 'dillon/crm-gen-invoice-update' into development Dillon 2023-03-19 03:49:21 +08:00
• 418c0c3279 Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-03-18 23:00:21 +08:00
• b86e7b175a update honey trap edmondlang 2023-03-18 23:00:02 +08:00
• 08435bb619 update command seasonalSegmantCompany:remove edmondlang 2023-03-18 20:15:59 +08:00
• 7a029afd64 update command seasonalSegmantCompany:remove edmondlang 2023-03-18 20:14:24 +08:00