Commit Graph

226 Commits

Author SHA1 Message Date
Dillon Ngo bf5ea2b2f2 Code sync from Shipping Portal, independent deployment of Vue Polling, Performance Improvement and tweaking for better user experience 2023-12-30 18:35:17 +08:00
Dillon Ngo 18df0e256b Code sync from Shipping Portal, independent deployment of Vue Polling, checkout from dillon/34-jenkins-vapor 2023-12-30 01:15:27 +08:00
edmondlang 6fe1ca3e0e update regenerate invoice 2023-11-09 10:21:04 +08:00
edmondlang 51766b6caa Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into regenerate-invoice-with-first-bill-no 2023-11-08 00:11:44 +08:00
edmondlang 5c5f54e03b delete booking / expire the order payment 2023-10-30 18:39:19 +08:00
edmondlang b0caccc0c1 update generate booking marking to 6 digits 2023-09-28 20:37:37 +08:00
edmondlang 9f2b431f21 regenerate-invoice-with-first-bill-no 2023-09-16 14:38:02 +08:00
Dillon c7927847c4 Voucherify phase 2 2023-07-17 21:29:19 +08:00
edmondlang f7446937a8 update UploadPurchaseOrderLogic fix compnay that not using auto PO 2023-07-04 13:24:06 +08:00
edmondlang 32b9bfab1c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/voucherify-35
# Conflicts:
#	routes/api.php
2023-06-22 23:09:50 +08:00
Omair Saleh 019bc9ce53 revert changes to CreateBookingPaymentLogic.php 2023-06-16 13:07:00 +08:00
Omair Saleh 2e9e7f9cc0 automatically complete tasks 2023-06-15 04:23:15 +08:00
edmondlang 1591cb9162 crm changes 2023-06-12 20:41:46 +08:00
Omair Saleh 585ce66e3c xpo 03-2023 2023-06-01 23:52:18 +08:00
Dillon f6cbb52bee Merge branch 'dillon/debug-and-fixes-3-36' into dillon/voucherify-35 2023-06-01 21:20:53 +08:00
Dillon 20d6ca47dc Vourcherify 2023-05-30 22:02:09 +08:00
Omair Saleh b89b911f71 Merge remote-tracking branch 'origin/master' 2023-05-30 12:32:46 +08:00
Omair Saleh 1f105421a1 xpo 04-2023 2023-05-30 12:32:29 +08:00
edmondlang 35edc807a8 recalculate wallet balance 2023-05-18 00:07:20 +08:00
Omair Saleh e84f288d39 xpo jan & feb 2023-05-15 10:44:04 +08:00
Dillon 40e4aae185 CRM create all remaining tasks according to documentation 2023-03-10 02:42:00 +08:00
Omair Saleh 764a4c4b84 Merge remote-tracking branch 'origin/master' 2023-02-23 15:59:41 +08:00
Omair Saleh 70cc33c776 update xpo 2023-02-23 15:59:28 +08:00
edmondlang bf3d1d0c23 remove text 2023-02-22 16:25:30 +08:00
edmondlang 0c21e6bd91 delete 1688 po 2023-02-22 10:47:28 +08:00
edmondlang f4cc6113a7 transfer booking owner 2023-02-07 00:48:20 +08:00
omair saleh f8ec4815a7 fix wallet insufficient balance when amount is below 0.01 2022-11-10 17:48:47 +08:00
omair saleh 62657e511c fix wallet insufficient balance when amount is below 0.01 2022-11-10 17:42:14 +08:00
omair saleh ca06fd03d5 delete 1688 purchase order for special customers 2022-11-03 12:23:49 +08:00
omair saleh 4f7f7bf7aa debug po upload 2022-10-28 10:05:22 +08:00
omair saleh 7892f37ed8 debug po upload 2022-10-28 10:03:23 +08:00
omair saleh a7d075dadf debug po upload 2022-10-28 10:01:52 +08:00
omair saleh 08ab6dd9c3 fix 1688 purchase order 2022-10-19 16:28:43 +08:00
omair saleh c8a8d04bcd Merge remote-tracking branch 'origin/master' 2022-10-11 17:48:48 +08:00
omair saleh b5acf80a29 fix regenerate invoice function to only include invoice documents 2022-10-11 17:48:30 +08:00
Omair Saleh fe07b820f5 fix create purchase order for 1688 processor 2022-09-30 05:08:40 +08:00
Omair Saleh 667c02aace fix create purchase order for 1688 processor 2022-09-30 04:47:49 +08:00
Omair Saleh 475846ab65 conditionally load wallet in company resource 2022-09-30 04:29:27 +08:00
Omair Saleh 879d6abdbd convert 1688 purchase order to po on document upload 2022-09-30 03:33:08 +08:00
Omair Saleh 2873a08256 convert 1688 purchase order to po on document upload 2022-09-30 03:29:53 +08:00
Omair Saleh ff3baa2b9c convert 1688 purchase order to po on document upload 2022-09-30 02:30:05 +08:00
Omair Saleh c9fadcaed5 convert 1688 purchase order to po on document upload 2022-09-30 02:19:35 +08:00
Omair Saleh bf18a18f1d update july xpo and pi 2022-09-27 11:31:44 +08:00
Omair Saleh ae4260dd15 update july xpo and pi 2022-09-27 11:24:19 +08:00
omair saleh 4555752218 generate invoices for 1688 orders 2022-09-08 20:22:30 +08:00
omair saleh fff77aee7f update june xpo 2022-09-01 17:50:22 +08:00
omair saleh b88bbc0eb7 xpo for may 2022-08-02 15:46:34 +08:00
omair saleh 409c53e9a0 fix upload purchase order 2022-07-27 13:21:03 +08:00
omair saleh b4b3fa33fd upload 1688 purchase order in pdf format 2022-07-21 14:56:29 +08:00
omair saleh 90461b172a Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	app/Classes/Modules/Transactions/ControllersLogic/CreateBulkPurchaseOrderDocumentLogic.php
2022-07-11 23:56:40 +08:00